HIROSHI OOTA <nil@mad.dog.cx>
authorChong Yidong <cyd@gnu.org>
Wed, 25 Jan 2012 05:55:39 +0000 (13:55 +0800)
committerChong Yidong <cyd@gnu.org>
Wed, 25 Jan 2012 05:55:39 +0000 (13:55 +0800)

Trivial merge